Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 03:07:02 +0000 (19:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 03:07:02 +0000 (19:07 -0800)
commit05f26f7d16c69718025bbb39abab8b186a910a28
treefab43d699d8732e13b29b139fa7ddbfc4bdba5bd
parente45e0ddf924d7f9353223d9a884ecf6c0f849434
parent14518570f857096a7c4856256e1798cedd92d4ce
Merge from trunk.
src/ChangeLog
src/alloc.c
src/lisp.h